Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Wed, 1 Jul 2015 19:37:56 +0000 (15:37 -0400)
committerTom Rini <[email protected]>
Wed, 1 Jul 2015 19:37:56 +0000 (15:37 -0400)

Trivial merge